Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate Merge PR API #8232

Merged
merged 15 commits into from
Sep 29, 2024
Merged

Integrate Merge PR API #8232

merged 15 commits into from
Sep 29, 2024

Conversation

itaigilo
Copy link
Contributor

@itaigilo itaigilo commented Sep 26, 2024

Closes #8210.

@itaigilo itaigilo added exclude-changelog PR description should not be included in next release changelog minor-change Used for PRs that don't require issue attached labels Sep 26, 2024
@itaigilo itaigilo requested a review from N-o-Z September 26, 2024 12:59
Copy link

E2E Test Results - DynamoDB Local - Local Block Adapter

13 passed

Copy link

E2E Test Results - Quickstart

10 passed

Base automatically changed from task/prfd-ux-ui-improvements to master September 26, 2024 16:22
Copy link
Member

@N-o-Z N-o-Z left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
One comment

@@ -32,18 +31,12 @@ const PullDetailsContent = ({repo, pull}) => {
setError(null);
setLoading(true);
try {
await refsAPI.merge(repo.id, pull.source_branch, pull.destination_branch);
await pullsAPI.merge(repo.id, pull.id);
} catch (error) {
setError(`Failed to merge pull request: ${error.message}`);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the error here may be confusing. The merge might have been successful and the failure was on the update.
Since we are returning a verbose error message from the server, lets just use it as is.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right! It's there since we had two different errors (merge + status change), and now it isn't relevant anymore.
Changed.

@itaigilo itaigilo enabled auto-merge (squash) September 29, 2024 05:16
@itaigilo itaigilo merged commit aa44bac into master Sep 29, 2024
38 checks passed
@itaigilo itaigilo deleted the task/prfd-integrate-pr-merge-api branch September 29, 2024 05:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
exclude-changelog PR description should not be included in next release changelog minor-change Used for PRs that don't require issue attached
Projects
None yet
Development

Successfully merging this pull request may close these issues.

PRfD - Create Merge PR API
2 participants